Prevent a false alarm constness warning with a cast.

Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a
	false alarm  constness warning with a cast.

	* gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
	for the inside-gdk case.

diff --git a/ChangeLog b/ChangeLog
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 27e0aa8ea42940406da49a1b128c51ed74dca256..234f43b779669608b6b5e1e021035a1d8316e33a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
 Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 0c696e8327de8e5377541421362b5924474ed495..cf2b41ffeeba82d02e397951fbbf2561c46a5543 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -134,7 +134,7 @@ _gdk_windowing_init_check (int argc, char **argv)
                                          10, 10, 10, 10, 0, 0 , 0);
   class_hint = XAllocClassHint();
   class_hint->res_name = g_get_prgname ();
-  class_hint->res_class = gdk_get_program_class ();
+  class_hint->res_class = (char *)gdk_get_program_class ();
   XmbSetWMProperties (gdk_display, _gdk_leader_window,
                       NULL, NULL, argv, argc, 
                       NULL, NULL, class_hint);

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 09385de30012d88ec4d100791996232e8972d658..00b57f4a1e41812ac6dd1c0122fa6d8cd21bc468 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -65,6 +65,7 @@ gint     gdk_x11_get_default_screen       (void);
 #include "gdkprivate-x11.h"
 
 #define GDK_ROOT_WINDOW()             _gdk_root_window
+#undef GDK_ROOT_PARENT
 #define GDK_ROOT_PARENT()             ((GdkWindow *)_gdk_parent_root)
 #define GDK_WINDOW_XDISPLAY(win)      (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xdisplay)
 #define GDK_WINDOW_XID(win)           (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)